780 vite update dependencies#794
Conversation
|
I am not sure what to make if this PR. It is containing work from other PRs? |
|
@timea-solid Yes, it was built from my working branch in #787. The commits are displayed as new commits because I rewrote history addressing some feedback before merging the PR. I guess @bourgeoa can cherry-pick his latest commit on top of main now, or reapply the changes, etc. But the last commit in the PR is what we should be looking at. I'll wait until he resolves the conflicts before adding my review though. |
|
@NoelDeMartin |
|
@bourgeoa The rebase didn't work as expected, because you've rebased the branch with my previous commits. If you look at the PR, it says there are 14 new commits but there should only be two (or maybe one, I think I already fixed that test in #796, I guess whichever gets merged first wins xD). Instead of a rebase, you should cherry-pick or apply your changes from a clean staging checkout. If you have issues doing that let me know and we can jump on a call and I help you do it. |
1ccdcfa to
66cbb82
Compare
|
@NoelDeMartin I had to fix test test/unit/login/login.test.ts |
No description provided.